build: Rename the 'enable-colord' option

Drop the 'enable-' prefix, to follow the naming best practices for Meson
configuration options.

diff --git a/meson_options.txt b/meson_options.txt
index 2f9dd80285886d8cde74b52efdf705435e977bfe..dd0046dd1026f194adef4a884047ffea378515f1 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('enable-colord', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
+option('colord', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
   description : 'Build colord support code')
 option('enable-x11-backend', type: 'boolean', value: 'true',
   description : 'Enable the X11 gdk backend')

diff --git a/modules/printbackends/cups/meson.build b/modules/printbackends/cups/meson.build
index a6f83d51e7fa8daaccfb9d6e71b8beda7988b49d..ef7a30ee9a1d4822f3b9276452836e159077dceb 100644 (file)
--- a/modules/printbackends/cups/meson.build
+++ b/modules/printbackends/cups/meson.build
@@ -1,4 +1,4 @@
-enable_colord = get_option('enable-colord')
+enable_colord = get_option('colord')
 if enable_colord != 'no'
   want_colord = enable_colord == 'yes'
   colord_dep = dependency('colord', version: '>= 0.1.9', required: want_colord)